Fix FROM commands