More fixes on stuff