Fixes for Linux authentication
Merge