Some more PHPDoc fixes