More fixes [skip CI]
More fixes [skip CI]


Former-commit-id: bfc3cbe640a57f48aad60d140d7038ce44df5dbd [formerly fe36d777ada76b3897052e5bc5f88c503231fd2f] [formerly fe36d777ada76b3897052e5bc5f88c503231fd2f [formerly badedfea0c77415fde64442dacd3003c331fb4c7]]
Former-commit-id: a22d1f1c638eda0b8ede8e8dea2b8046d24d2530
Former-commit-id: ba9cc025d39ed12d8240caa28f97633887210a99
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine