Fixes suggested by Ganesh