Fixed more errors :(