Optimize some calls to improve performance on lower-end PCs