fix some marketplace bugs