Minor improvements
Minor improvements


Former-commit-id: 4623e5609e6a17fc3e1fe626724f41bac03f5cbb [formerly 4623e5609e6a17fc3e1fe626724f41bac03f5cbb [formerly f9b1c7e59dd0ccc78d7916cf64303f2bbae95ff4]]
Former-commit-id: 870b9fb3645ecf7ba09cfd64b493fd0e5b7e6caa
Former-commit-id: f42bd3c7fdc77121338ae1c5f26ac207ab81cbec
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine