Some other tweaks related to relations and site ownership