Resolve errors with JDK 1.7

Hi, Eric:

Errors are cleaned. Please merge and try. Thanks a lot.

Best,
Richard