Fixes for cross language to work