T61 -- COMMIT 25 : Minor changes.