Fixed issues #MIFOSX-972, #MIFOSX-1016, #MIFOSX-1018