Various shop fixes.