Alignment and tweaks