Addressing both ICC issues in #120