Add some @Override annotations