Fixes to language issues