Fix modal button selectors (again!)