More buggfixes