Fixed some stuff for mac build
Merge branch 'feature/mac_build' into develop