Update monoD solution and fix build