Initial fix for permission problems