Final debugging tweaks.