Various fixes, WalUploader