Fixes some bugs I introduced

roll still appears to not be working