Fixes for 1.1 authentication and bootstrap!