some fixes to disable performance related problems in a non problematic way