ACF-15: Aligment adjustments