Fix bugs between driver and store