fixing some areas that occasionnaly raise warnings