Fixed bug in shakedown and findIdByName.