Fix some service join logic