A few more tweaks, prepping for merge