[TIMOB-13697] Fixed some more small bugs with the dependency analyzer and some code tweaks.