Fixed complier warnings