Fixing build on JDK 5