Fix solution build