Sudo related fixes