xbodrv bug fixes