misc fixes

1 job for master in 5 minutes and 17 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Test
passed lint #1355100445

00:05:17