register spill prevention: small fixes
register spill prevention: further fixes