Small fix + less debug output