- Fix sample tracking and restore config