Make solution buildable
Make solution buildable