Fixing a few more errors.