Couple of fixes moving from osx to linux