Hotfix/static analysis fixes

Includes minor fixes that we currently need and aren't yet in stormpath `dev`