Fixed more mistakes