More progress on compilation