Some performance updates