Minor code changes to match current issues
Merge branch 'master' of https://github.com/cameronfletcher/getauthenticated