Correct some bugs
Merge branch 'feature/shop_debug' into develop