Tweaks to help debugging