More setup script additions.