last marketplace fixes