commit early alignment fixes