More debug, fix define