New hardcoded fixes