Some fixes [skip hazardlib]
Some fixes [skip hazardlib]


Former-commit-id: 79dee97053e8a972edcb2e0a5bf84b05e38b48a1 [formerly 79dee97053e8a972edcb2e0a5bf84b05e38b48a1 [formerly 8771239fc6fc6f59035484beebe1da4945791b6e]]
Former-commit-id: 3798cc6a042e65f3f976718122f4d0d98dd1cf80
Former-commit-id: b6c4caca9b058d3b7126ce6d25a16abc400deb6d
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine