- Fixed mac and standalone compile