Fix for startup scripts