More compatibility changes.
Added some missing license headers.