fix license headers, restore IOverrideDefaultStatements