fix compile errors introduced by -source 1.6