Hardcoded fixes