Minor tweaks around the new classes