CE-108 Conventions tweaks