Merge branch 'BUILD-FIXES-EEK' into 'master'

Build fixes eek

Closes #416

See merge request !43
1 job from master in 5 minutes and 18 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #95045
build-fedora

00:05:18