More stuff fixed