+Minor tweaks