Fixing various PHPDoc related issues