Authentication token fixes.