Fix stuff that breaks on Ubuntu - no idea why