Made some types explicit in CEq