Further cleanup

Cleaning up some minor bits and pieces that got missed previously.