Fix ICE issues