Additional debug tuning