More fixes! My fixes! Mine alone!