Fixed client/server issues