More debug print tweaks