Fix int/uint8 issue. Add padding.