A few minor misc tweaks