Fixed data type bugs.