Merge branch 'various_fixes' into 'master'

Various fixes

See merge request fsl/fslpy!103
13 jobs for master in 1 minute and 28 seconds (queued for 2 seconds)