Tweaks to classes