And even more priv owner fixes