handful of alignment fixes