Fixes to license per rules/guidelines