Fix scratch-buffer alignment warnings
6 files changed