Real world fixes
Friday nigth commit