Fixes from E2E testing + minor cleanup