Small tweaks to object setup.