Solved bugs with Java 1.6 compiler