A couple of fixes discussed earlier with @apipkin and @lsmith

I delayed this fix because I was much into row editing but I had the TODO for them pending so I put them both together here. 

See the individual commit messages below.