Mercury Router bug fixes