Stabilizations and bugfixing.