Add optimisations for GUI.