Fixed many warning