Added/upvoted Kent's two bugs.

Leo build: 20141028085939