fixup run and setup