Efficiency fixes