Add bool to get around non functional torch to stop EOSCC from FC
Tweaks to mk files