Make more fit for release.