Merge "Prevent failures when running as non-admin"