Various tweaks based on feedback