Compilation fixes and update of MonoD solution