Fixed problems after merging Web and WS projects