some bugfixes for e2e tests