Some Type, CS, PHPDoc fixes