make fixups