added some safe local variables