Some changes to help debug.