More RasPlex specific changes