bug fixes on drivers and rd