Windows compile fixups.