MacOS X and Other Related Fixes (cont'd)

A minor fix due to the previous patch.