Modifications (first round) to make ceps compile with Visual Studio 2014 CTP