Issue #208, cleanup more ios bugs.