Fix some more things