Some modal fixes