Owner control + edit fixes