More debug msgs and a couple of issues