Fix some more stuff up