Fixed errors in ShopNoGUI
Merge branch 'Shane'