Slave-mode fixes
Slave-mode fixes

fredrikbryntesson/rock,cogneco/rock,thomasfanell/rock,kirbyfan64/rock,marcusnaslund/rock,davidhesselbom/rock,magic-lang/rock,ooc-lang/rock,cogneco/rock,thomasfanell/rock,fasterthanlime/rock,ds84182/rock,magic-lang/rock,jonathanudd/rock,ooc-lang/rock,fasterthanlime/rock,kirbyfan64/rock,jonathanudd/rock,davidhesselbom/rock,marcusnaslund/rock,shamanas/rock,zhaihj/rock,fredrikbryntesson/rock,zhaihj/rock,shamanas/rock,ds84182/rock