Fix some alignment issues