Merged manual updates on debugging.