Various fixes/improvements to has_access