Minor tweaks for modal