EN50494: small fixes