5.15 performance

I ran some tests on the latest version, so made a couple of quick changes.
Merge them if you like, otherwise just ditch this request ;)