Further bignumber fixes