Fix Problems Relating to Add