Match access rights
Cleaning things up