Couple of modal fixes