Various fixes needed to get this working properly with Evolve OS