Lint fixes
Lint fix (matching bit widths)