More missed bignumber changes and cleanup