Debug cleanup & config path fix