More compile fixups