Ensure utility classes have consistent definitions