Fixed MacOS issues with C2k distribution