Mac build fixes and package according to Singularity format