Oil conditioning and handling