Order Type Bug Fixes