Fix references to owner and group