Adjust some minor stuff