Create product fixes

Mixing Promises and callbacks feels wrong.