Fix mismatch between SA header size and layout