bug fix: MIFOSX-201 and MIFOSX-202

Hi Keith,

This commit includes fix for MIFOSX-201 and MIFOSX-202.

Regards
Ashok