More bignum and 5.6 changes