Fixed some bugs
Fixed some bugs


Former-commit-id: 4131f4495933591850d4c11f2cab363568ee5fb4 [formerly 4131f4495933591850d4c11f2cab363568ee5fb4 [formerly 69aad6f4ea5445bee36b109c3e57696c2463a8bd]]
Former-commit-id: 9581c064a88df585cb1ab0254f3e5b6ea172cf80
Former-commit-id: 2097bf96c92a64623a5596069c8282ee05d6d440
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine