Fixed more stupid mistakes

This is why I should not program at 4 in the morning...