Fixed some server/client stuff