fix some overwrite issues