Intial setup bug fixes