Minor bugfixing.