Minor fixes and correcting Project configuration