Minor corrections and e2e tests