Fix small breakages after merge