Few minor fixes were made, to make AuthBootstrap working as expected.