Minor cleanups

I thought I should send these two in.