More cruft changes