Minor tweaks all around