Minor mods and Package moves