Fix scratch-buffer alignment warnings