More fixes for stairs and capture logs in e2e tests