Add warnings and recovery for misalignments.