Some Comport updates