minor fixes for unit and e2e configs