CE-1125 Conventions fixes