Next PhpDoc updates and fixes