More debugging tweaks