Lint cleanup plus some other changes necessary to enabled publishing.