Changes to make initial setup easier