misc fixes for mac and linux installations we tested on