Revert i/o hack
Fix rzscontrol binary build && misc