Fixes to make Eq sub-project capable