Fixed enablement and bad class names