Convert over last few files to stdint types too