Towards mac compilability