recovery: alignment fixes