Fixes for join message