fixes and etc for wsd 2013