Tweaks to classifier