Jakub, > This patch fixes both of these issues. Ok for trunk if bootstrap/regtest > pass? OK for trunk if the bootstrap/regtest is good. Are there any performance issues that can result from this patch? Thanks for the patch Paul