Added Fixes from Master for Refresh Token