3.0 - Fix more doc blocks errors