Driver collection bug fixes