Bugfixes for release.