A few more tweaks to make setup similar.