Language fixes (thanks @brianteeman)