A few more tweaks to how modals work