More changes on saturday

saturday 3 compiler errors