Roll and command block fixes