File ownership fixes