More fixes, heat vision fixes