Updates to patch initial setup bug.