Merge branch 'small_fixes' into 'NIFTy_5'

more fixes

See merge request !296
11 jobs for NIFTy_5 in 20 minutes and 53 seconds (queued for 1 second)