Updating tools for 2012 R2 compatibility