Merge branch 'minor_fixes' into 'master'

Minor fixes

See merge request !4
2 jobs for master in 6 minutes and 16 seconds (queued for 3 seconds)
latest
Status Name Job ID Coverage
  Test
passed test #118

00:02:24

 
  Build
passed build #119

00:03:51