Some changes to help with debuging.