NYCCHKBK-3666 - Fix alignment issues