Compliation issues fixed