Checking in a couple minor fixes to get them out of the way.