LCO-1266 Joel's fixes to make pitcher work in AWS.