Replicate changes from https://github.com/davvid/go-odbc