More debug

See changelog