Added fixes from iOS6 version of Application