More debugging tweaks.