Fixed a few bugs in overviews.
Fix merge.