Some bug fixes to DataGrabber by JWatkins