BRANCH 4.3: more alignment fixes for bootstrap