Minor fixes related to modals