Minor java6 cleanup