Fixed missing @Override warnings