Minor bug fix to facilitate running without user credentials