Added in changes from the PTR (cgame)