Dedicated Server tweaks

Untested, but I think I've got it separated enough. Also a NPE fix for tanks.