Setup kit updates

Minor updates for setup kit.