Some bug fixes to Withdraw() found in edge case testing