Raft of bug fixes for peeking