Fixes for language module changes