Fixes roll, class errors