Some hopefully final tweaks