Updated for VS2012
Minor fixes to two remote impl

Changes following two remote testing