File adjustments made to evade some bug