Language fixes and tests