Some additional tweaks needed before promises can be chained.