changes to make mac build work