Fix more alignment issues