Fixing small server/client communication issues