Promise fixes.