Fixes for orderhistory