Additional fixes discovered via Amazon AWS testing