AWT - modal fixes