Minor changes to try to bring the code in line with Prabhaka\'s changes..