Some performance changes