Fixed more errors. Please don't commit errors, guys!