Minor tweaks here n there