Some fixes for a more recent ubuntu version.