Various tweaks here and there