Patch fixing

Updated File Handler and LocationUpdate