A few minor tweaks here and there.