Correct two problems slipped in with r28753. Thanks Teru for spotting.