Fixed server and client issues (I don't think anybody on this team knows
the difference between server and client)