Arcade and Classes Fixes