Small fixes according to robweb's review

Status Job ID Name Coverage
  Test
canceled #32290
build

failed #32286
build