Fixes some order and orderItem bugs