Fix various alignment issues.