Add @Override annotations that are missing for JDK-1.6 compatibility.