Some fixes from internal meeting.