Minor changes from debugging