Porting some 1.7 stuff back and fixing client side crash on servers...