Updates for VS14 Roslyn build