Code changes from VS14 CTP 3 (not working yet)