further fixes by ranjan