Fixed namespace issue
Fixed segfault in driver