More adjustments to integer constants