late fix on two merge conflicts from the odyseey migration