Fix disable of vehicle fw/type changes