Minor tweaks

/CC @counterbeing