Make a few more functions work with promises