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


Former-commit-id: b1b0e7d6c818eaca98e862c134b55b14396cb0f1 [formerly b1b0e7d6c818eaca98e862c134b55b14396cb0f1 [formerly 3a5c04f5b11e08f45850b98be4503c54f87912d8]]
Former-commit-id: 5acc0b48dbff7021d60815eeecfeedea75dccaeb
Former-commit-id: 592bd69ff89e0e799b2d118cbf07c740a54fdb50
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine