Fixing things that will hopefully fix build on github