Judge and host bug fixes