Adjust some values to fit vanilla better