Compile fix, more wallet changes

Fixes for windows-qt