Prioritization fixes