[5.0] Docblock Fixes