Fixes from Eric's review.