Bring in line with latest OOBase

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
MSVC updates

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>