Elementary setup improvements.