Changes to build on VS2013

Didn't like the default move-ctor.
Or boolean #define flags.