bug fixes raised by client