Fixed some marketplace bugs