order final fixes