Debug changes making problems a bit clearer