Minor tweaks :wrench: