Minor initial setup setup bug fixes