More BINARY_ALIGN & SALT_ALIGN fixes. There a lot still to do.