Changes that fixed the solution build