some modal fixes