Small tweaks to class prototypes