Fix up phpdoc type/comment issues