Add backup collector and other fixes