Ash/13w46 fixes into master