Fix startup and newer versions