Don't overwrite model.xml + small cleanups