Small tweaks (#238)