Fix debug system and helper class