More fixes to solution build configurations for Rx.sln