Last fixes before merge.