Some changes to prepare for 1.7 and start of locolazation support