Try to fix errors in mac build