Further fixes integer conversion errors