Tweaked to allow x-platform build (to include M$W)