Fixes for Java 1.5 version of java.awt.
Merge 1.4 fixes for Java 1.5 java.awt.