Minor tweaks and such