Path and permission fixes