New version fixes

All fixed up for version Furious Koala.