HEMERA-3514: Some things still failing