Minor tweaks

Leave open for now