Minor tweaks, prepping for a merge