Few datatype fixes
Merge branch 'master' into API10