Small fixes
Small fixes


Former-commit-id: 7a22419a8639acb2392856decd2685aaa3338275 [formerly 1ea9ad0622a80f6ef2ffc246f577c7d9dcbbc518]
Former-commit-id: fbff9b68bd05899732cdf39978057e749e1e95e8
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine