Modified some more to conform to OSS rules.