More bugfixing.