Fixed errors in Marketplace

This resolves #42 Marketplace issue.