Miscellaneous cleanups and corrections

3 jobs for master in 3 minutes and 11 seconds (queued for 15 seconds)
Status Name Job ID Coverage
  Build
passed build #511778

00:00:59

 
  Test
passed test #511779

00:00:23

96.8481%
 
  Package
passed package #511780

00:01:48