Small tweaks to work with beetle better