Getting everything building correctly in new env

fixing some interface issues for TFS 2012 Compat