fix several modal transitions