Follow-up fixes on modal