Small fixes to file ownership