Fixes java 6 errors from previous commit.