Some minor optimizations for COLO