Small improvements in setup.