Fix issues with salt's file state and file module