alignment fixes and rebuild