Small tweaks to a few classes