Merge branch 'modules/misc-improvements' into 'master'

Misc. improvements to the modules

See merge request amanda/nix!5