Change some more callbacks into promises