Fixed MIFOSX-278 and MIFOSX-280

Hi Keith,

This commit includes fix to MIFOSX-278 and MIFOSX-280.


Regards
Ashok