Further updates to fix PHPdoc checks