Just small bugfixing