Fix alignment issues.