More fixes for owner mode