Fixes to unified stdint usage

This recalls 14caf174ff219376e4f1234bd297ffe973cc416e