Ash/13w47 fixes

this will close socioware-13w47 milestone bugs