Resolve ISO and IMG build issues