More small bugfixes