Fixups again