Fix some more stupid mistakes