fixups required for successfull setup