Cleanup
Ubuntu compatability changes