Minor improvements on auth & siteContext