fixes suggested by lakshmi