More Language Fixes