More stuff fixed.