various small changes

3 jobs for master
Status Name Job ID Coverage
  Build
canceled build #513529

 
  Test
canceled test #513530

 
  Package
canceled package #513531