merge windows build fixes from camera branch