Updates for IceFog and CyberGate