Fixes initial startup