Fixed bug if master password hash isn't used.
Clean up a bunch of warnings