Fixing more errors (again).