Fixing some issues due to file names