Fixing master build and adding DYLD_LIBRARY_PATH workaraound for Mac