Make more stuff async