Fix to make solution build