Fixed more errors (I think...)