Various PHPDoc fixes