Fixes for products multi eloader