More minor changes to setup.