More tweaks to linking/access points