Minor mods to a few files