Fixed errors stemming from Q.all