Restored check for add-ons; Other cleanup