Fixes for bitmessage