Code cleanups.
Code cleanups. Use fixed sizes for all types.