Small tweaks to traits