Fix some items to minimize latency