Some fixes
Some fixes


Former-commit-id: 19e4b5983b6a38fda3eaafe7517773383679e7ed [formerly 7df72862d244939eae1179b4cb2c975c46637f89] [formerly 7df72862d244939eae1179b4cb2c975c46637f89 [formerly 0e73eeb30b2fd396333966b9189f207f5869f7d6]]
Former-commit-id: dcc33ced23180be25ac051c9f4cff17eaa6dd4ed
Former-commit-id: e80947649b792167d6405d4edff3c33cdb346b44
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine