Fix an issue and remove some scar tissue