Minor tweaks
Merged a tiny derp