JAL-2827 related fixes for stem and non-canonical annotation