Fix compilations handling with a more solid code