Fix some shop issues.