Fixed up some more errors.