Fix first run access issues