Permission issue fixes