Build 92.1: Performance optimisations