even more fixes
even more fixes


Former-commit-id: a11bd6d9d60eb0262c38c36ff578a7318ee5cf58 [formerly 44d220c7f46a89a39e81b02b896c2ac3de45271e]
Former-commit-id: 1fbbd4291bba3943dc62be94980f5aafa7efd71b
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine