Fix some modal issues