Fixes from nim review.