Fixing up the umask management