Changes for TF2 demo compatibility