Update to be fully functional with either BNC or not + SSL without hacking it together.