More promise tweaks.