Minor tweaks here and there