misc modal fixes