Last fixes before sending