Sync for Class Fixes