Prod Marketplace Application Bugfixes

**Ready to Merge**