Correct 2 last errors generated by Java6