Fix LFI issues