Tweaks from VS Gallery suggestions