Last fixes before demo day.