Fixes after reopening on Aquinas
Fixes to run under Mac