Fix startup and install