More fixes [skip hazardlib]
More fixes [skip hazardlib]


Former-commit-id: 020e5f7f97843d061f4e4ed0558b87bad0f19be1 [formerly 020e5f7f97843d061f4e4ed0558b87bad0f19be1 [formerly b16270d9a45a802b1fe17900a2b867878b055209]]
Former-commit-id: 106f9d7fc61befe336d1a97cefb72f73b4bcbeca
Former-commit-id: 837352b3a3a8149afef1432c59cf2210d04761b8
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine