Minor clean-up tweaks