Adjustments for 1.8.7 and permission fixes