Language fixes for front end