Marketplace bugfixes