Some changes added to compile and run with Java 6 and Java 7.

  - overload problems

Change-Id: I15a367dbce3a52557c8236fe0888f0174dfff024