Minor updates, also don't crash when not authorized