Adding more fixes to stomp casting/addressing issues on 32-bit systems.