Bug Fixes for 1.23 release

Fixed issuess MIFOSX-1099,MIFOSX-1299