Additional Ubuntu Support fixes