Small Changes before starting GUI