Fixed issues on product creation