iOS7 and iPad (when in popover controller) fixes.