Fixes after code review.