more modal fixes