Small Fixes

Not sure these fixes will work 100% but I cannot run them from the labs
in 4115HB so someone else please test it :P