Some fixes in shopbundle