Fixing more bugs found when connecting to a testnet....  Mostly small stuff (gas charge stuff).