Fix some more stuff