Class tweaks