Applied changes around SelenoHost not being static