Fix & Put back debugs