More fixes
More fixes


Former-commit-id: 3adc2a980ef2b6bbd71f16f52e9d6e8d9fa85d4e [formerly 8fd5c11ca58dda262d7fb4d45723975c50e4e318]
Former-commit-id: 0ba23e26d536fbb09797385f3e145f2a9f3d14b5
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine