fixes for fileURL
merged