A little debug, tweak