Class Fixes