Some fixes
Some fixes


Former-commit-id: 1838a14c2e84733f384413ccb8ebffc8ac3e23c1 [formerly 84437fe475bdd641c3350cf2a099b2dbbef955cf]
Former-commit-id: a4dd4dc0fae21372e34fd137cd5b2368b51be1f6
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine