More bugfixery