Create product fixes

Same here, map would be better.