Fixed remaining issues - MIFOSX-1388