basic mods to work with latest ubuntu