Multiple CS/PHPDoc fixes