(ENoC) Synthesis fixes

Completed some fixes to the files that were preventing synthesis