Updates #610 (fixes after some win/xcode changes in a separate repo)
Signed-off-by: David Anderson <dave@natulte.net>