Debug info + fix