fix more Java1.5 incompatibility

Change-Id: I32881e06d278df6319822a5ecf282aa97cf24bc8