Market bugfixes