Fixed some more stupid mistakes