Performance improvements in some core methods