register spill prevention: further fixes