Fixing some things in driving world