Last fixes before presentation