Fix the alignment issues