Fixes for pb 0.5 authorization work