Finally done with compile warnings