Fixes on shop