Fixes to item ordering.