More integer division fixups