Adjust some problems