Fixes on issues discuss on meeting.