final preorder fixes