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


Former-commit-id: 7beafc37a1913b2e5cbf5ed725d9717788ec7e60 [formerly 7beafc37a1913b2e5cbf5ed725d9717788ec7e60 [formerly 4ee3733a271a2680149d4fb55623c0a493a81720]]
Former-commit-id: cc122dacb31faadebd91ba264ae480acd7a80ade
Former-commit-id: 774caedb067f0bb0756de10b418d0d42ee005361
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine