couple of bugfixes in result driver