Make practical changes to drvtrb