Got rid of some potentially unhandled permissions differences.