Added a few more path fixes and added some TODOs for mono migration.