Two potential bugs with failing specs

I ran into what look like two bugs, but I'd love to get some feedback on what I'm seeing before trying to track them down, so I made a pull request with examples of both.