A couple of fixes and a useful print