fixing compilations issues