Fixes in lunch model