PHPDoc / Types fixes