Fixing a couple issues caused when refactoring descriptions