Found a few more mistakes