Code modifications necessary to get Final Merge to work on EC2.