fix datatype related stuff

Change-Id: Ieca95f3e923ea4743f6273138f62d7215e104b5e