WPML missing elements in translated pages

Hi, I seem to be having the same issue in Fortuna as mentioned in comments on the Envato page about a month ago, namely: “i can’t translate custom VC shortcodes like boc_btn, boc_heading because WPML doesn’t display them in the page translation. Also they aren’t included in the XLIFF files that WPML generates for export. How can i resolve this? Now I’m only able to translate text fields.”

Is there a fix for this?

Also the translated pages do not respect the “Show Page Heading” button when it is set to “off”. It IS turned off in the native language but then heading the reappears again in the translated version.

Any ideas?

Thanks
Graham