Minor optimizations

1 job for master in 4 minutes and 6 seconds
Status Job ID Name Coverage
  Test
passed #18919121
test

00:04:06