Fixed Metal bugs