Real-world fixes