Fix some modal bugs