Fixing builds