Prepare for further bugfixing.