Code changes from debugging.