Fixing a few things that were breaking destroy && up