Fix some of the IQ findings