Real world fixes