Minor ammends to modals