Bug bugfixing before RC3.