Tweaks to classifications