Few fixes for picosecond driver

--CAR