Fixing missing files issues