Some fix [skip hazardlib][demos]
Some fix [skip hazardlib][demos]


Former-commit-id: b4d04c832119984617fa4542ade0cd4adf4f8fbe [formerly 982f491aeee42c22d93a8b0df8af6ee04d193b0a]
Former-commit-id: e350ea16c0a34939702387f71f4fb4ead534e6b3
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine