Fixed the PHPnd issues for the project