Fixed some more mistakes