Mainly language specific fixes