Add missing @Override annotations

These were found by static code analysis in Eclipse.
Fix issues found by findbugs