Some relatively minor tweaks from ages ago