Fix some options

Quick fix for umask and cp_r with "unusual" arguments.