Initial compile changes