Fixed up some misc. errors.