Fix up compile issue; bump to jdk7