Fixes to make Eq sub-project capable
Fixes to make Eq sub-project capable