fixups required for successfull setup
fixup2