Fixed compliation issues