Docblock fixes

Several PHP Docblock fixes