A few minor misc things

This looks familiar....