Tweaks to various classes.