Additional phpdoc fixes