Minor Setup update