Couple of final touches before I branch to the jwt branch