Deprecated phpdoc fixes