Final bugfixes for release