Adjust some ordering