Make new changes compile