Minor tweaks

WIP.