Fixing on-start issues