HR-186 - Misc cleanup/tweaks