Fixes to solution to make main branch buildable