fixing compilation issues