Few datatype fixes