5.4.051.3

More alignments fixes for trackers