openHost merge bugs fixed