More compile changes