Fix some lang errors and template names