fix a few integer value problem