Fixups - building again