Minor fixes to make e2e scenario work.