Forgot a couple of await when refactoring