Fix some type/doc issues.